Fix a theming problem with colors in GtkCalendar. (#499703, Michael

2007-11-26  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkcalendar.c: Fix a theming problem with colors
        in GtkCalendar.  (#499703, Michael Hofmann)

svn path=/trunk/; revision=19055

diff --git a/ChangeLog b/ChangeLog
index 9f96930326cc84f3bbd338768903822778dbf625..65366c2c7a6acefc874b8cbf7f120558751ed5d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-26  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkcalendar.c: Fix a theming problem with colors
+       in GtkCalendar.  (#499703, Michael Hofmann)
+
 2007-11-26  Matthias Clasen  <mclasen@redhat.com>
 
        * configure.in: Bump glib requirement to 2.15.0 (for g_test_init)

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index dc32cba7a845d76c2d04dbf6d18d12507c095e9b..61a832ac3f168028486b26453f413d841ba2183f 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -191,10 +191,10 @@ dates_difference(guint year1, guint mm1, guint dd1,
 #define HEADER_BG_COLOR(widget)                 (& (widget)->style->bg[GTK_WIDGET_STATE (widget)])
 #define SELECTED_BG_COLOR(widget)       (& (widget)->style->base[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
 #define SELECTED_FG_COLOR(widget)       (& (widget)->style->text[GTK_WIDGET_HAS_FOCUS (widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE])
-#define NORMAL_DAY_COLOR(widget)        (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
+#define NORMAL_DAY_COLOR(widget)        (& (widget)->style->text[GTK_WIDGET_STATE (widget)])
 #define PREV_MONTH_COLOR(widget)        (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
 #define NEXT_MONTH_COLOR(widget)        (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])
-#define MARKED_COLOR(widget)            (& (widget)->style->fg[GTK_WIDGET_STATE (widget)])
+#define MARKED_COLOR(widget)            (& (widget)->style->text[GTK_WIDGET_STATE (widget)])
 #define BACKGROUND_COLOR(widget)        (& (widget)->style->base[GTK_WIDGET_STATE (widget)])
 #define HIGHLIGHT_BACK_COLOR(widget)    (& (widget)->style->mid[GTK_WIDGET_STATE (widget)])